Check-in [1ee88e8ff7]

Login
Home Timeline Branches Tags Help

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Proposal to change merge order
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | merge-order
Files: files | file ages | folders
SHA3-256: 1ee88e8ff7980292709d36a9b3f92bfd5111cc451664d66b16424a0634d8dcaf
User & Date: jan.nijtmans 2024-10-29 12:02:17.909
Context
2024-10-29
12:02
Proposal to change merge order Leaf check-in: 1ee88e8ff7 user: jan.nijtmans tags: merge-order
2024-10-27
22:55
new TIP #703: info locale and info timezone check-in: 956429f4bd user: jan.nijtmans tags: main, trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to tip/386.md.
︙︙
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112







113
114
115
116
117
118
119
120
121
122
123
124
125


It is expected that large projects will be conducted on named branches in the
Fossil repository; in fact, such a project should most likely be commenced by
committing to a branch in your local clone. If you do not wish to share your
work with others, you may use a private branch, and Fossil will refrain from
synchronizing it when you synchronize your clone.

Simple bug fixes should be developed on the branch of the _earliest_ stable
release that you intend to fix, and then merged forward onto the later
releases' branches. It is expected that such "dovetail merges" will be
frequent, so as to control the number of nuisance conflicts that will have to
be resolved when merging.

Questions about Fossil on the Tcl'ers Chat or in comp.lang.tcl are encouraged;
it's essential that all Tcl/Tk developers develop at least some familiarity
with the technology, and it's somewhat new to all of us!

# Requesting access

Tcl and Tk maintainers may request repository access by emailing one of the
Tcl Core Team members on the following list:

   Joe English, Donal Fellows, Jeff Hobbs, Kevin Kenny, Andreas Kupries, Don
   Porter

all of whom have the required access to add new users to core.tcl-lang.org.








# Acknowledgments

Major thanks are due to Roy Keene, for leading the migration effort, to Jörg
Sonnenberger \(author of cvs2fossil\) and D. Richard Hipp \(author of fossil
itself\) for many hours of unpaid support in getting the conversion to go, to
Mark Janssen for developing scripts to audit the Fossil content against
historical Tcl/Tk distributions, and to the many Tcl/Tk developers who tested
and debugged the conversion process.

# Copyright

This document has been placed in the public domain.









|
<
|
<
<















>
>
>
>
>
>
>














86
87
88
89
90
91
92
93

94


95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129


It is expected that large projects will be conducted on named branches in the
Fossil repository; in fact, such a project should most likely be commenced by
committing to a branch in your local clone. If you do not wish to share your
work with others, you may use a private branch, and Fossil will refrain from
synchronizing it when you synchronize your clone.

Simple bug fixes as well as large new features should be developed first on

named branches derived from trunk.



Questions about Fossil on the Tcl'ers Chat or in comp.lang.tcl are encouraged;
it's essential that all Tcl/Tk developers develop at least some familiarity
with the technology, and it's somewhat new to all of us!

# Requesting access

Tcl and Tk maintainers may request repository access by emailing one of the
Tcl Core Team members on the following list:

   Joe English, Donal Fellows, Jeff Hobbs, Kevin Kenny, Andreas Kupries, Don
   Porter

all of whom have the required access to add new users to core.tcl-lang.org.

# History

Originally, the recommendation for simple bug fixes was that they should be
developed on the branch of the _earliest_ stable release intended to fix.
Later (2024-10-??) it was decided that all bug-fixes should be developed
on trunk first.

# Acknowledgments

Major thanks are due to Roy Keene, for leading the migration effort, to Jörg
Sonnenberger \(author of cvs2fossil\) and D. Richard Hipp \(author of fossil
itself\) for many hours of unpaid support in getting the conversion to go, to
Mark Janssen for developing scripts to audit the Fossil content against
historical Tcl/Tk distributions, and to the many Tcl/Tk developers who tested
and debugged the conversion process.

# Copyright

This document has been placed in the public domain.